Fix disableSandboxForPluginCommands
#5855
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was broken in #5846 which accidentally used the default value instead of passing along the global option. rdar://101681661
|
@swift-ci please smoke test |
|
@swift-ci please test package compatibility |
tomerd
reviewed
Oct 31, 2022
| @@ -263,6 +263,7 @@ extension SwiftCommand { | |||
| additionalFileRules: FileRuleDescription.swiftpmFileTypes, | |||
| pluginScriptRunner: swiftTool.getPluginScriptRunner(), | |||
| pluginWorkDirectory: try swiftTool.getActiveWorkspace().location.pluginWorkingDirectory, | |||
| disableSandboxForPluginCommands: swiftTool.options.security.shouldDisableSandbox, | |||
There was a problem hiding this comment.
It's complicated™️
We have a test that's been added in #4283, but it didn't trigger here for two reasons:
- We are running neither macOS 12 nor installing the concurrency compatibility libs on Swift CI, which leads to plugin tests being skipped on macOS and the sandboxing tests are macOS-only (rdar://100780895)
- Build commands generated by plugins are running in a sandbox that currently has blanket approval for
/private/tmpwhich also happens to be where we're placing test examples during test execution, so the sandbox is more open than normally during tests. Sandbox for manifests and plugins should provide a unique path specified byTMPDIRinstead of allowing/tmp#4307 aims to address that by giving individual plugins unique temporary directories
There was a problem hiding this comment.
FYI, I have rebased that Sandbox TMPDIR PR and revived it.
tomerd
approved these changes
Oct 31, 2022
DougGregor
added a commit
that referenced
this pull request
Nov 1, 2022
This reverts commit 256c682.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was broken in #5846 which accidentally used the default value instead of passing along the global option.
rdar://101681661